From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 7 Jan 2012 20:00:56 +0000 (-0800)
Subject: Fix ChangeLog typo.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1224^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9e9979f06b0401cab2e6818c9f1b9443a0f22227;p=emacs.git

Fix ChangeLog typo.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dac7953b60a..828fc68d541 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -133,7 +133,6 @@
 
 	* mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded
 	headers of non-MIME messages, when rmail-enable-mime is non-nil.
->>>>>>> MERGE-SOURCE
 
 2011-12-29  Michael Albinus  <michael.albinus@gmx.de>